diff --git a/CHANGELOG b/CHANGELOG
index c340fc9..d0676a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fixed compilation for ARM when using a (standard) hard-FP toolchain
+  Patch by Anders Larsen, 07 Oct 2005 
+
 * Cleanup warnings for cpu/arm720t & cpu/arm1136 files.
   sed the linker scripts, rather than pre-process them.
   Patch by Peter Pearse, 07 Oct 2005
diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c
index ca6bd89..d8dfb4c 100644
--- a/drivers/cfi_flash.c
+++ b/drivers/cfi_flash.c
@@ -221,7 +221,7 @@
 	cfiptr_t cptr;
 	int x, y;
 
-	for (x = 0; x < 0x40; x += 16 / info->portwidth) {
+	for (x = 0; x < 0x40; x += 16U / info->portwidth) {
 		cptr.cp =
 			flash_make_addr (info, sect,
 					 x + FLASH_OFFSET_CFI_RESP);
@@ -807,7 +807,7 @@
 #else
 	for (i = 1; i <= info->portwidth; i++)
 #endif
-		*cp++ = (i % info->chipwidth) ? '\0' : cmd;
+		*cp++ = (i & (info->chipwidth - 1)) ? '\0' : cmd;
 }
 
 /*